From 22743fd8df6fb0b44052e14698647c6f3b95f2d2 Mon Sep 17 00:00:00 2001 From: "kaf24@freefall.cl.cam.ac.uk" Date: Wed, 8 Sep 2004 20:16:51 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.140 (413f68b3CREFxIOSuiOduTrHnibufQ) Fix ClearForeignPage defintion in Linux 2.4 and 2.6. --- linux-2.4.27-xen-sparse/include/linux/mm.h | 5 ++++- linux-2.6.8.1-xen-sparse/include/linux/page-flags.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/linux-2.4.27-xen-sparse/include/linux/mm.h b/linux-2.4.27-xen-sparse/include/linux/mm.h index 523bcffd53..bd7d65c77c 100644 --- a/linux-2.4.27-xen-sparse/include/linux/mm.h +++ b/linux-2.4.27-xen-sparse/include/linux/mm.h @@ -336,7 +336,10 @@ typedef struct page { set_bit(PG_foreign, &(page)->flags); \ (page)->mapping = (void *)dtor; \ } while (0) -#define ClearPageForeign(page) clear_bit(PG_foreign, &(page)->flags) +#define ClearPageForeign(page) do { \ + clear_bit(PG_foreign, &(page)->flags); \ + (page)->mapping = NULL; \ +} while (0) #define PageForeignDestructor(page) \ ( (void (*) (struct page *)) (page)->mapping ) #else diff --git a/linux-2.6.8.1-xen-sparse/include/linux/page-flags.h b/linux-2.6.8.1-xen-sparse/include/linux/page-flags.h index b155a20953..fdf0d3f8ec 100644 --- a/linux-2.6.8.1-xen-sparse/include/linux/page-flags.h +++ b/linux-2.6.8.1-xen-sparse/include/linux/page-flags.h @@ -304,7 +304,10 @@ extern unsigned long __read_page_state(unsigned offset); set_bit(PG_foreign, &(page)->flags); \ (page)->mapping = (void *)dtor; \ } while (0) -#define ClearPageForeign(page) clear_bit(PG_foreign, &(page)->flags) +#define ClearPageForeign(page) do { \ + clear_bit(PG_foreign, &(page)->flags); \ + (page)->mapping = NULL; \ +} while (0) #define PageForeignDestructor(page) \ ( (void (*) (struct page *)) (page)->mapping ) #else -- 2.30.2